@yoavbls I fixed some things that got lost in the merge conflicts or where git did not recognize that a file was moved, or instead took the old file over the one from main.

The only thing that remains is checking the package.json files for package versions. I will try and see if I can get to that this week. A lot of the versions stated in the monorepo are older than the ones that the main branch currently has. I suggest using #142 to update as much of the non-breaking stuff we can, breaking updates can be done at a later date when the monorepo branch is merged.

I do suggest getting this one PR done before merging anything else, as more changes will introduce more possible merge conflicts.

@yoavbls It was a lot easier than I imagined. I synced all dependencies with what is currently on the main branch in d285c3c.

I will review it one last time, but I think its ready. All packages work and build, vsce packages the extension successfully and having tested it I can spot no regressions so far.

@yoavbls I caught 1 more missing change, I think this one is ready for a merge.